gtk/gtkdnd-quartz.c gtk/gtkdnd.c gtk/gtkentry.c gtk/gtkfilesel.c

2008-08-11  Sven Neumann  <sven@gimp.org>

	* gtk/gtkdnd-quartz.c
	* gtk/gtkdnd.c
	* gtk/gtkentry.c
	* gtk/gtkfilesel.c
	* gtk/gtkimcontextsimple.c
	* gtk/gtkimmulticontext.c
	* gtk/gtkoptionmenu.c
	* gtk/gtkplug.c
	* gtk/gtkrecentchooserdefault.c
	* gtk/gtkscrolledwindow.c
	* gtk/gtksocket-x11.c: use canonical signal names in some more
	places that I missed earlier.

svn path=/trunk/; revision=21069

diff --git a/ChangeLog b/ChangeLog
index 00ccc44f9134a6392f8e4ef40c5e633f596fc37f..7be85673600ae6fd6143e968bb4248783b0dad9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-11  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkdnd-quartz.c
+       * gtk/gtkdnd.c
+       * gtk/gtkentry.c
+       * gtk/gtkfilesel.c
+       * gtk/gtkimcontextsimple.c
+       * gtk/gtkimmulticontext.c
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkplug.c
+       * gtk/gtkrecentchooserdefault.c
+       * gtk/gtkscrolledwindow.c
+       * gtk/gtksocket-x11.c: use canonical signal names in some more
+       places that I missed earlier.
+
 2008-08-11  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkaccelgroup.c

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index a8c44673a82ddc97995a72b640487fe90638ad06..2e6aee70a033d07d6da2235706f20324f31d1ee4 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -150,7 +150,7 @@ struct _GtkDragFindData
                            selection_data.target, 
                            &target_info)) 
     {
-      g_signal_emit_by_name (info->widget, "drag_data_get",
+      g_signal_emit_by_name (info->widget, "drag-data-get",
                             info->context,
                             &selection_data,
                             target_info,
@@ -209,7 +209,7 @@ gtk_drag_get_data (GtkWidget      *widget,
          if (!(site->flags & GTK_DEST_DEFAULT_DROP) ||
              selection_data->length >= 0)
            g_signal_emit_by_name (widget,
-                                  "drag_data_received",
+                                  "drag-data-received",
                                   context, info->drop_x, info->drop_y,
                                   selection_data,
                                   target_info, time);
@@ -218,7 +218,7 @@ gtk_drag_get_data (GtkWidget      *widget,
   else
     {
       g_signal_emit_by_name (widget,
-                            "drag_data_received",
+                            "drag-data-received",
                             context, info->drop_x, info->drop_y,
                             selection_data,
                             0, time);
@@ -775,7 +775,7 @@ gtk_drag_dest_leave (GtkWidget      *widget,
   
   if (!(site->flags & GTK_DEST_DEFAULT_MOTION) || site->have_drag ||
       site->track_motion)
-    g_signal_emit_by_name (widget, "drag_leave", context, time);
+    g_signal_emit_by_name (widget, "drag-leave", context, time);
   
   site->have_drag = FALSE;
 }
@@ -818,7 +818,7 @@ gtk_drag_dest_motion (GtkWidget          *widget,
        }
     }
 
-  g_signal_emit_by_name (widget, "drag_motion",
+  g_signal_emit_by_name (widget, "drag-motion",
                         context, x, y, time, &retval);
 
   return (site->flags & GTK_DEST_DEFAULT_MOTION) ? TRUE : retval;
@@ -857,7 +857,7 @@ gtk_drag_dest_drop (GtkWidget            *widget,
        gtk_drag_get_data (widget, context, target, time);
     }
   
-  g_signal_emit_by_name (widget, "drag_drop",
+  g_signal_emit_by_name (widget, "drag-drop",
                         context, x, y, time, &retval);
 
   return (site->flags & GTK_DEST_DEFAULT_DROP) ? TRUE : retval;
@@ -1058,7 +1058,7 @@ gtk_drag_begin_internal (GtkWidget         *widget,
 
   info->possible_actions = actions;
   
-  g_signal_emit_by_name (widget, "drag_begin", info->context);
+  g_signal_emit_by_name (widget, "drag-begin", info->context);
 
   /* Ensure that we have an icon before we start the drag; the
    * application may have set one in ::drag_begin, or it may
@@ -1757,7 +1757,7 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
   if (info->icon_pixbuf)
     g_object_unref (info->icon_pixbuf);
 
-  g_signal_emit_by_name (info->widget, "drag_end", 
+  g_signal_emit_by_name (info->widget, "drag-end", 
                         info->context);
 
   if (info->widget)

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 2300f938222ba941d0b832e420e0a470f6386e3e..2dc28ea77fade2e42d189c76870f9c3793598cad 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1603,7 +1603,7 @@ gtk_drag_selection_received (GtkWidget        *widget,
              if (!(site->flags & GTK_DEST_DEFAULT_DROP) ||
                  selection_data->length >= 0)
                g_signal_emit_by_name (drop_widget,
-                                      "drag_data_received",
+                                      "drag-data-received",
                                       context, info->drop_x, info->drop_y,
                                       selection_data,
                                       target_info, time);
@@ -1612,7 +1612,7 @@ gtk_drag_selection_received (GtkWidget        *widget,
       else
        {
          g_signal_emit_by_name (drop_widget,
-                                "drag_data_received",
+                                "drag-data-received",
                                 context, info->drop_x, info->drop_y,
                                 selection_data,
                                 0, time);
@@ -1964,7 +1964,7 @@ gtk_drag_dest_leave (GtkWidget      *widget,
 
       if (!(site->flags & GTK_DEST_DEFAULT_MOTION) || site->have_drag ||
          site->track_motion)
-       g_signal_emit_by_name (widget, "drag_leave", context, time);
+       g_signal_emit_by_name (widget, "drag-leave", context, time);
       
       site->have_drag = FALSE;
     }
@@ -2071,7 +2071,7 @@ gtk_drag_dest_motion (GtkWidget        *widget,
        }
     }
 
-  g_signal_emit_by_name (widget, "drag_motion",
+  g_signal_emit_by_name (widget, "drag-motion",
                         context, x, y, time, &retval);
 
   return (site->flags & GTK_DEST_DEFAULT_MOTION) ? TRUE : retval;
@@ -2172,7 +2172,7 @@ gtk_drag_dest_drop (GtkWidget          *widget,
            gtk_drag_get_data (widget, context, target, time);
        }
 
-      g_signal_emit_by_name (widget, "drag_drop",
+      g_signal_emit_by_name (widget, "drag-drop",
                             context, x, y, time, &retval);
 
       return (site->flags & GTK_DEST_DEFAULT_DROP) ? TRUE : retval;
@@ -2280,7 +2280,7 @@ gtk_drag_begin_internal (GtkWidget         *widget,
                               &info->cur_screen, &info->cur_x, &info->cur_y, NULL);
     }
 
-  g_signal_emit_by_name (widget, "drag_begin", info->context);
+  g_signal_emit_by_name (widget, "drag-begin", info->context);
 
   /* Ensure that we have an icon before we start the drag; the
    * application may have set one in ::drag_begin, or it may
@@ -3449,7 +3449,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
   else
     {
       if (!success)
-       g_signal_emit_by_name (info->widget, "drag_failed",
+       g_signal_emit_by_name (info->widget, "drag-failed",
                               info->context, result, &success);
 
       if (success)
@@ -3537,7 +3537,7 @@ gtk_drag_drop (GtkDragSourceInfo *info,
              selection_data.data = NULL;
              selection_data.length = -1;
              
-             g_signal_emit_by_name (info->widget, "drag_data_get",
+             g_signal_emit_by_name (info->widget, "drag-data-get",
                                     info->context, &selection_data,
                                     pair->info,
                                     time);
@@ -3655,7 +3655,7 @@ gtk_drag_selection_get (GtkWidget        *widget,
     {
     case TARGET_DELETE:
       g_signal_emit_by_name (info->widget,
-                            "drag_data_delete", 
+                            "drag-data-delete", 
                             info->context);
       gtk_selection_data_set (selection_data, null_atom, 8, NULL, 0);
       break;
@@ -3687,7 +3687,7 @@ gtk_drag_selection_get (GtkWidget        *widget,
                                    selection_data->target, 
                                    &target_info))
            {
-             g_signal_emit_by_name (info->widget, "drag_data_get",
+             g_signal_emit_by_name (info->widget, "drag-data-get",
                                     info->context,
                                     selection_data,
                                     target_info,
@@ -3799,8 +3799,7 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
                                        info);
 
   if (!info->proxy_dest)
-    g_signal_emit_by_name (info->widget, "drag_end", 
-                          info->context);
+    g_signal_emit_by_name (info->widget, "drag-end", info->context);
 
   if (info->widget)
     g_object_unref (info->widget);

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a88ed2c725cfafaa3534542da1b7b76c6318d94d..4f00012119e801b7131254b1bf64c1818d2526ab 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2312,7 +2312,7 @@ gtk_entry_insert_text (GtkEditable *editable,
   text[new_text_length] = '\0';
   strncpy (text, new_text, new_text_length);
 
-  g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position);
+  g_signal_emit_by_name (editable, "insert-text", text, new_text_length, position);
 
   if (!entry->visible)
     trash_area (text, new_text_length);
@@ -2339,7 +2339,7 @@ gtk_entry_delete_text (GtkEditable *editable,
   
   g_object_ref (editable);
 
-  g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
+  g_signal_emit_by_name (editable, "delete-text", start_pos, end_pos);
 
   g_object_unref (editable);
 }

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 00b050e5d79d178289391cb59596f8c8a869723e..21a0af37f61b4c05eb42f60a4849888935970992 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -704,7 +704,7 @@ gtk_file_selection_init (GtkFileSelection *filesel)
 
   gtk_widget_set_size_request (filesel->dir_list,
                               DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
-  g_signal_connect (filesel->dir_list, "row_activated",
+  g_signal_connect (filesel->dir_list, "row-activated",
                    G_CALLBACK (gtk_file_selection_dir_activate), filesel);
 
   /*  gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
@@ -740,7 +740,7 @@ gtk_file_selection_init (GtkFileSelection *filesel)
 
   gtk_widget_set_size_request (filesel->file_list,
                               FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
-  g_signal_connect (filesel->file_list, "row_activated",
+  g_signal_connect (filesel->file_list, "row-activated",
                    G_CALLBACK (gtk_file_selection_file_activate), filesel);
   g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
                    G_CALLBACK (gtk_file_selection_file_changed), filesel);
@@ -795,13 +795,13 @@ gtk_file_selection_init (GtkFileSelection *filesel)
   gtk_widget_show (eventbox);
 
   filesel->selection_entry = gtk_entry_new ();
-  g_signal_connect (filesel->selection_entry, "key_press_event",
+  g_signal_connect (filesel->selection_entry, "key-press-event",
                    G_CALLBACK (gtk_file_selection_key_press), filesel);
-  g_signal_connect (filesel->selection_entry, "insert_text",
+  g_signal_connect (filesel->selection_entry, "insert-text",
                    G_CALLBACK (gtk_file_selection_insert_text), NULL);
   g_signal_connect_swapped (filesel->selection_entry, "changed",
                            G_CALLBACK (gtk_file_selection_update_fileops), filesel);
-  g_signal_connect_swapped (filesel->selection_entry, "focus_in_event",
+  g_signal_connect_swapped (filesel->selection_entry, "focus-in-event",
                            G_CALLBACK (grab_default),
                            filesel->ok_button);
   g_signal_connect_swapped (filesel->selection_entry, "activate",
@@ -980,7 +980,7 @@ file_selection_setup_dnd (GtkFileSelection *filesel)
                     GDK_ACTION_COPY);
   gtk_drag_dest_add_uri_targets (GTK_WIDGET (filesel));
 
-  g_signal_connect (filesel, "drag_data_received",
+  g_signal_connect (filesel, "drag-data-received",
                    G_CALLBACK (filenames_dropped), NULL);
 
   eventbox = gtk_widget_get_parent (filesel->selection_text);
@@ -991,7 +991,7 @@ file_selection_setup_dnd (GtkFileSelection *filesel)
   gtk_drag_source_add_uri_targets (eventbox);
   gtk_drag_source_add_text_targets (eventbox);
 
-  g_signal_connect (eventbox, "drag_data_get",
+  g_signal_connect (eventbox, "drag-data-get",
                    G_CALLBACK (filenames_drag_get), filesel);
 }
 

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index fa8e5705270c75e73a75cc17724f1fb2577bdac8..8e5813796faf9db5bac3151be34106141d2448a3 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -160,8 +160,8 @@ gtk_im_context_simple_commit_char (GtkIMContext *context,
       context_simple->in_hex_sequence = FALSE;  
       context_simple->tentative_match = 0;
       context_simple->tentative_match_len = 0;
-      g_signal_emit_by_name (context_simple, "preedit_changed");
-      g_signal_emit_by_name (context_simple, "preedit_end");
+      g_signal_emit_by_name (context_simple, "preedit-changed");
+      g_signal_emit_by_name (context_simple, "preedit-end");
     }
 
   g_signal_emit_by_name (context, "commit", &buf);
@@ -254,7 +254,7 @@ check_table (GtkIMContextSimple    *context_simple,
                  context_simple->tentative_match = value;
                  context_simple->tentative_match_len = n_compose;
                
-                 g_signal_emit_by_name (context_simple, "preedit_changed");
+                 g_signal_emit_by_name (context_simple, "preedit-changed");
 
                  return TRUE;
                }
@@ -316,7 +316,7 @@ check_compact_table (GtkIMContextSimple    *context_simple,
                 break;
               else
                 {
-                  g_signal_emit_by_name (context_simple, "preedit_changed");
+                  g_signal_emit_by_name (context_simple, "preedit-changed");
                  return TRUE;
                 }
              }
@@ -724,8 +724,8 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
              context_simple->in_hex_sequence = FALSE;
              context_simple->compose_buffer[0] = 0;
              
-             g_signal_emit_by_name (context_simple, "preedit_changed");
-             g_signal_emit_by_name (context_simple, "preedit_end");
+             g_signal_emit_by_name (context_simple, "preedit-changed");
+             g_signal_emit_by_name (context_simple, "preedit-end");
            }
 
          return TRUE;
@@ -787,10 +787,10 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
          context_simple->in_hex_sequence = FALSE;
        }
 
-      g_signal_emit_by_name (context_simple, "preedit_changed");
+      g_signal_emit_by_name (context_simple, "preedit-changed");
 
       if (!context_simple->in_hex_sequence)
-        g_signal_emit_by_name (context_simple, "preedit_end");
+        g_signal_emit_by_name (context_simple, "preedit-end");
       
       return TRUE;
     }
@@ -824,8 +824,8 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
       context_simple->modifiers_dropped = FALSE;
       context_simple->tentative_match = 0;
 
-      g_signal_emit_by_name (context_simple, "preedit_start");
-      g_signal_emit_by_name (context_simple, "preedit_changed");
+      g_signal_emit_by_name (context_simple, "preedit-start");
+      g_signal_emit_by_name (context_simple, "preedit-changed");
   
       return TRUE;
     }
@@ -881,10 +881,10 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
           else if (!check_hex (context_simple, n_compose))
            beep_window (event->window);
          
-         g_signal_emit_by_name (context_simple, "preedit_changed");
+         g_signal_emit_by_name (context_simple, "preedit-changed");
 
          if (!context_simple->in_hex_sequence)
-           g_signal_emit_by_name (context_simple, "preedit_end");
+           g_signal_emit_by_name (context_simple, "preedit-end");
 
          return TRUE;
         }
@@ -922,8 +922,8 @@ gtk_im_context_simple_reset (GtkIMContext *context)
       context_simple->in_hex_sequence = FALSE;
       context_simple->tentative_match = 0;
       context_simple->tentative_match_len = 0;
-      g_signal_emit_by_name (context_simple, "preedit_changed");
-      g_signal_emit_by_name (context_simple, "preedit_end");
+      g_signal_emit_by_name (context_simple, "preedit-changed");
+      g_signal_emit_by_name (context_simple, "preedit-end");
     }
 }
 

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index e6ec521c6ddd0d5a255eedf5e85027e291d9d988..3b73cc40fd2ab22e37a0d94eae5b1bba91f23317 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -186,22 +186,22 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
     {
       g_object_ref (multicontext->slave);
 
-      g_signal_connect (multicontext->slave, "preedit_start",
+      g_signal_connect (multicontext->slave, "preedit-start",
                        G_CALLBACK (gtk_im_multicontext_preedit_start_cb),
                        multicontext);
-      g_signal_connect (multicontext->slave, "preedit_end",
+      g_signal_connect (multicontext->slave, "preedit-end",
                        G_CALLBACK (gtk_im_multicontext_preedit_end_cb),
                        multicontext);
-      g_signal_connect (multicontext->slave, "preedit_changed",
+      g_signal_connect (multicontext->slave, "preedit-changed",
                        G_CALLBACK (gtk_im_multicontext_preedit_changed_cb),
                        multicontext);
       g_signal_connect (multicontext->slave, "commit",
                        G_CALLBACK (gtk_im_multicontext_commit_cb),
                        multicontext);
-      g_signal_connect (multicontext->slave, "retrieve_surrounding",
+      g_signal_connect (multicontext->slave, "retrieve-surrounding",
                        G_CALLBACK (gtk_im_multicontext_retrieve_surrounding_cb),
                        multicontext);
-      g_signal_connect (multicontext->slave, "delete_surrounding",
+      g_signal_connect (multicontext->slave, "delete-surrounding",
                        G_CALLBACK (gtk_im_multicontext_delete_surrounding_cb),
                        multicontext);
       
@@ -216,7 +216,7 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
     }
 
   if (need_preedit_changed)
-    g_signal_emit_by_name (multicontext, "preedit_changed");
+    g_signal_emit_by_name (multicontext, "preedit-changed");
 }
 
 static GtkIMContext *
@@ -435,21 +435,21 @@ static void
 gtk_im_multicontext_preedit_start_cb   (GtkIMContext      *slave,
                                        GtkIMMulticontext *multicontext)
 {
-  g_signal_emit_by_name (multicontext, "preedit_start");
+  g_signal_emit_by_name (multicontext, "preedit-start");
 }
 
 static void
 gtk_im_multicontext_preedit_end_cb (GtkIMContext      *slave,
                                    GtkIMMulticontext *multicontext)
 {
-  g_signal_emit_by_name (multicontext, "preedit_end");
+  g_signal_emit_by_name (multicontext, "preedit-end");
 }
 
 static void
 gtk_im_multicontext_preedit_changed_cb (GtkIMContext      *slave,
                                        GtkIMMulticontext *multicontext)
 {
-  g_signal_emit_by_name (multicontext, "preedit_changed");
+  g_signal_emit_by_name (multicontext, "preedit-changed");
 }
 
 static void
@@ -466,7 +466,7 @@ gtk_im_multicontext_retrieve_surrounding_cb (GtkIMContext      *slave,
 {
   gboolean result;
   
-  g_signal_emit_by_name (multicontext, "retrieve_surrounding", &result);
+  g_signal_emit_by_name (multicontext, "retrieve-surrounding", &result);
 
   return result;
 }
@@ -479,7 +479,7 @@ gtk_im_multicontext_delete_surrounding_cb (GtkIMContext      *slave,
 {
   gboolean result;
   
-  g_signal_emit_by_name (multicontext, "delete_surrounding",
+  g_signal_emit_by_name (multicontext, "delete-surrounding",
                         offset, n_chars, &result);
 
   return result;

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 4e63e0d55c4d3d5589f8234c40fb32aa21ab7eae..df9ca3369c79b75093e486683d18261950b6efde 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -253,7 +253,7 @@ gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
       g_signal_connect_after (option_menu->menu, "selection-done",
                              G_CALLBACK (gtk_option_menu_selection_done),
                              option_menu);
-      g_signal_connect_swapped (option_menu->menu, "size_request",
+      g_signal_connect_swapped (option_menu->menu, "size-request",
                                G_CALLBACK (gtk_option_menu_calc_size),
                                option_menu);
 
@@ -776,7 +776,7 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
              gtk_widget_reparent (child, GTK_WIDGET (option_menu));
            }
 
-         g_signal_connect (option_menu->menu_item, "state_changed",
+         g_signal_connect (option_menu->menu_item, "state-changed",
                            G_CALLBACK (gtk_option_menu_item_state_changed_cb), option_menu);
          g_signal_connect (option_menu->menu_item, "destroy",
                            G_CALLBACK (gtk_option_menu_item_destroy_cb), option_menu);

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 08182749e5390761f9bf48b3c6960a3422ac9efc..a0373f982b64dbe620deb4de0e07aa12e27e1a42 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -334,7 +334,7 @@ _gtk_plug_add_to_socket (GtkPlug   *plug,
 
   gtk_widget_set_parent (widget, GTK_WIDGET (socket_));
 
-  g_signal_emit_by_name (socket_, "plug_added");
+  g_signal_emit_by_name (socket_, "plug-added");
 }
 
 /**
@@ -414,7 +414,7 @@ _gtk_plug_remove_from_socket (GtkPlug   *plug,
 
   gtk_plug_set_is_child (plug, FALSE);
                    
-  g_signal_emit_by_name (socket_, "plug_removed", &result);
+  g_signal_emit_by_name (socket_, "plug-removed", &result);
   if (!result)
     gtk_widget_destroy (GTK_WIDGET (socket_));
 

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index cd777938e0a795a5340cebcbaf5e810363f43cfa..57ee733759a3da543e50e748844703e6a8ecce48 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -387,9 +387,9 @@ gtk_recent_chooser_default_constructor (GType                  type,
                    G_CALLBACK (recent_view_popup_menu_cb), impl);
   g_signal_connect (impl->recent_view, "button-press-event",
                    G_CALLBACK (recent_view_button_press_cb), impl);
-  g_signal_connect (impl->recent_view, "drag_begin",
+  g_signal_connect (impl->recent_view, "drag-begin",
                    G_CALLBACK (recent_view_drag_begin_cb), impl);
-  g_signal_connect (impl->recent_view, "drag_data_get",
+  g_signal_connect (impl->recent_view, "drag-data-get",
                    G_CALLBACK (recent_view_drag_data_get_cb), impl);
 
   g_object_set (impl->recent_view, "has-tooltip", TRUE, NULL);

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 1bfd40718a0d4b5b6edba478bd413d7c64e2e77c..e9dc57c1befc981efcce6000a14dc3d990c511d6 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1151,7 +1151,7 @@ gtk_scrolled_window_move_focus_out (GtkScrolledWindow *scrolled_window,
   g_object_ref (scrolled_window);
   
   scrolled_window->focus_out = TRUE;
-  g_signal_emit_by_name (toplevel, "move_focus", direction_type);
+  g_signal_emit_by_name (toplevel, "move-focus", direction_type);
   scrolled_window->focus_out = FALSE;
   
   g_object_unref (scrolled_window);

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index b1faae7f8a38e303e6c04b1a770a1e5b05b05470..12489088ea9b3ec841932e1f5daf8258cae88577 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -506,7 +506,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
            _gtk_socket_end_embedding (socket);
 
            g_object_ref (widget);
-           g_signal_emit_by_name (widget, "plug_removed", &result);
+           g_signal_emit_by_name (widget, "plug-removed", &result);
            if (!result)
              gtk_widget_destroy (widget);
            g_object_unref (widget);